Merge d37669074c1b1151b2d4fa0483d1947bcb08c3c5 on remote branch

Change-Id: I68c90a144b6ddec51f4abdc8c1a9c1fcd73206bf
tree: 07a8bcb3938abebe15e0f06fb5448cd0c86ec85e
  1. hal/
  2. vendor_product.mk