Merge dc34e9d5fbb7404067750d857a369c4b7682a3b0 on remote branch

Change-Id: Ie6251e41cf8a7ef6837877d3413bc1f3852b6f95
tree: 8d88e12d877f42d342dcf36838a3f8bfbcd2bf47
  1. etc/
  2. hal/
  3. vendor_product.mk