Shorten TARGET_BRAND from generic_<arch> to Android
am: 5806531f92

* commit '5806531f92a3670362ec8dceafd0079d51afbd18':
  Shorten TARGET_BRAND from generic_<arch> to Android