ANDROID: android-base.cfg: properly sort the file

It somehow got out of alphabetical order, fix it to make merges and
testing easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 21afcf6ff8c745ab9c551f113eeaacff3f41b515)