Merge 4962c87eed91ab25a1bc1c9e3cd4295caba209eb on remote branch

Change-Id: I2916ca1826fc2cb106268150af94ad00ba810965
tree: 10f32a2df7733c3b549b44619ff02851b6364482
  1. etc/
  2. hal/
  3. vendor_product.mk