Merge 0676cf0966c39db678f3666e0953cd8fe966686e on remote branch

Change-Id: I1bcae00b7c9ded8bf3810a3a464f0c7a2eeb9826
tree: 6ac5df8f882037422073e6010e76e0f9162c8e6f
  1. etc/
  2. hal/
  3. vendor_product.mk