Merge 3210a733f69a9714e6f499386c8b3fe29e904641 on remote branch

Change-Id: I4d09c9260cfb765d4d1c8f0ac9aba603d35cbf6f
tree: 73a6ed15543d7fa64970745a9dec1bf1a515202f
  1. etc/
  2. hal/
  3. vendor_product.mk