Merge 7a4aea185959ff33e5be67b6b58ba00bb3e9383e on remote branch

Change-Id: I3e19d8ac171260f4f6aca23721cb01d29bf11792
tree: 6b246c743b30ac5585c8e17501e75d686db3cb5d
  1. etc/
  2. hal/
  3. vendor_product.mk