Merge 165d429ba4f0a9ae92ab04d59bf12ae9f5183da8 on remote branch

Change-Id: Ida2875c0f94033f8c7d77a99487ff8708f6ca878
tree: cb3584e08964eaf4b9211c004a217ca81db33f0b
  1. etc/
  2. hal/
  3. vendor_product.mk