Merge bbbe1f415818200f98268fb6e34f8592612604b3 on remote branch

Change-Id: Iab98c006260f12ea46a986f0f11a5f93aaf69408
tree: 263e26001aef29f27ec3bbd86427dbb3757b8999
  1. hal/
  2. vendor_product.mk