Merge 0b2f9ba7b0a9d6b8c7eee4f1b84ccfcab861b795 on remote branch

Change-Id: I7425b5c3a151aea771fc00d68673fe407a386840
tree: 2435e2c1712ba1dea964347c0ce6bed5991c95b1
  1. etc/
  2. hal/
  3. vendor_product.mk