Merge 9604df41306aa529aed724e3956f05f5b773b08f on remote branch

Change-Id: Ic2388d9796b3be1f3d0976df6874a47a7e2a14ae
tree: 0c60e269c2249e5dae2eaa79fcf16403a483a2a6
  1. etc/
  2. hal/
  3. vendor_product.mk