Merge d89bc561f7d80230e7fd8293680f83d3edf2b89b on remote branch

Change-Id: I145608ccb803ec21d8ef71527873eca796fb6f0e
tree: 8bcf71ce1b91150245041b0f6af6b758ad4981b4
  1. etc/
  2. hal/
  3. vendor_product.mk