Merge df070f71d6d9daa85a6b4b8d614f7654a33d7fc7 on remote branch

Change-Id: If09239d11b23020397bc416a4e09c64db1c927df
tree: 92ddbbbbb90e256cf0eda924727a60dbad1c763a
  1. etc/
  2. hal/
  3. vendor_product.mk