Merge 9acb215e5ccdf9fe8a9e1afc8f27afd9d58e9cf4 on remote branch

Change-Id: I94dc2e183423f76124e6a5baaa3a1bd9d1daeb78
tree: 338b847779eed57eb92992e5a00ffaf5b0dff7a4
  1. etc/
  2. hal/
  3. vendor_product.mk