Merge 6024c676cd8eada94651fea4e175923c152c7d07 on remote branch

Change-Id: Iccba943983243e297dc95632aaf57254164f79bd
tree: 7e27192b8765b16f49846fff05f9079b8a43e1d7
  1. etc/
  2. hal/
  3. vendor_product.mk