Merge 06ef6d7d5c22777393a538a3416a93112d22193d on remote branch

Change-Id: I529daa13fba4e8c375a316874a8ef00d4a415f1f
tree: bf072f7ec8b4bdf1167d1347e811a59553c9816c
  1. hal/
  2. vendor_product.mk