am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d

* commit '9b2077d4b969e9f8598242915f094552c5d78ad5':
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path