Merge 059a0aa1d07499a42b605adfc36f13bab5a0d3ba on remote branch

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