Merge 8077fd883a621ea1c51cd8a9d74da562c919ca74 on remote branch

Change-Id: Ie440d20cd4c7edd596188834b28b7c1162bc4996
tree: 098577b5a18d914ffdf1f2da84639f2d28daee86
  1. etc/
  2. hal/
  3. vendor_product.mk