am 3bbaab31: Merge changes I2514f66f,I71fed98d

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