Merge 13c5646a4f8db035e0f97fa112cc4e8b4e20d0ed on remote branch

Change-Id: I2e6e90ab8db28b5fb45f3105677dce7e6e9f57ca
tree: d38ee080d857fc1724ccf52d5dc21d60109386cf
  1. etc/
  2. hal/
  3. vendor_product.mk