Merge 0e326ef1448463a6c35b3534fc7ead841440f6d8 on remote branch

Change-Id: I07293a9c3e8c0e5f4cd5e971d575e41f90856f3c
tree: 5aaba9ae6cc4c09d3d354c4a88e4a4f8f69ee28d
  1. etc/
  2. hal/
  3. vendor_product.mk