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

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