Merge 42508d5f56a61c2513a4c8ba5fe22ea24946b216 on remote branch

Change-Id: Iaaebe90bd38ea63335fc6b603a2b8073920153a3
tree: cb98d4e948a9ef4a4217c7f75623e85a526551ae
  1. etc/
  2. hal/
  3. vendor_product.mk