Merge 71aa9d525a0e01c869ae5f8cf3cc880d5f48a7c6 on remote branch

Change-Id: I9910f4f3e266957a433ea427919c67ee40f63a0f
tree: 38c8981bb6d575822e85425c8f7d98866c040e6c
  1. etc/
  2. hal/
  3. vendor_product.mk