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

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