Merge 059a0aa1d07499a42b605adfc36f13bab5a0d3ba on remote branch

Change-Id: I2cd25fcb9cdc672f8b23a9c6e4d0017bbf988888
tree: e62aaf032562677cea3052dfe6ad3308321f8f02
  1. etc/
  2. hal/
  3. vendor_product.mk