Merge 710ecf85c546bfd70337e52e678793515850f37e on remote branch

Change-Id: If86035ceb33009945fa15af34a40d9200a68feaa
tree: 20e4c82a49df016b15d812ebff89cea9f0913504
  1. etc/
  2. hal/
  3. vendor_product.mk