Merge 6e4e4521e259bb5cbcd57f8c5fd16db2a87f31a4 on remote branch

Change-Id: I51d4ecb460f129f8ebfc8353a24a7f9e2a6f29be
tree: 4c7b601454b8b37273d8770c75f33900f018d85d
  1. etc/
  2. hal/
  3. vendor_product.mk