Merge 56335870135348b2a6e11ea0cca39e9d4783b22c on remote branch

Change-Id: Id66c30fb25c6b44a68ae4c1274f8dd0cc8ddd336
tree: f46c6b13a73d264c3763a8126c8ab26f6f9ef54e
  1. hal/
  2. vendor_product.mk