Merge efbcbe6a7321027fac668e3b91f9250e79e4e82e on remote branch

Change-Id: I1877b2d8ec31d4278f190a600fac53405a2a6ba7
tree: a0581ba3909ade176047016dc99aacfa739147bd
  1. etc/
  2. hal/
  3. vendor_product.mk