Merge dd413abe3f6dc2e9b207911f9526d0df7e3e24f4 on remote branch

Change-Id: I001ee9b6a54276ce1151e674f0d597161579509a
tree: 7c93858aef7c76e97f416b5406c8d0b01f294723
  1. etc/
  2. hal/
  3. vendor_product.mk