Merge 9dd264a7dbd7807d247d606694ba04c5d0e87b36 on remote branch

Change-Id: I196f306c7ef81116bd0289a0277ed473f9763921
tree: cd5775e2d8c84b6f966bea7d7a3d7b803fc92442
  1. etc/
  2. hal/
  3. vendor_product.mk