Merge d37669074c1b1151b2d4fa0483d1947bcb08c3c5 on remote branch

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