Merge 086658c87748ba97586361ec803b5ac1064ece82 on remote branch

Change-Id: Iccb89ed6f1ab8d12a9c39cd30a81de2efd5b328b
tree: 922586996536f69ca2b22cd93ffe6864ab45921b
  1. etc/
  2. hal/
  3. vendor_product.mk