Merge f91a9cf67b195d88d4c8dd117a609e5298dd8b92 on remote branch

Change-Id: I4fc92d8508ae02d724f3cb64ea59d82a58bae39a
tree: 9d3f36556a1a20942918ed6ef21aeff97de12aeb
  1. etc/
  2. hal/
  3. vendor_product.mk