Merge 4553fcce22c4c82f689a5468b80bcf1a3454ea3a on remote branch

Change-Id: Ie47f28c15a670bd4f01bc519c206250b234546b9
tree: 8a14652eb5bf058046ba4bd7e88cece61f43775c
  1. etc/
  2. hal/
  3. vendor_product.mk