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

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