Merge 15cd6ddcf1de8193e0a1f0f9983314dbed75e0c8 on remote branch

Change-Id: I32d69f537ca439a66fe9ff94e21dee2552d1a7ff
tree: 1b1424ca32ca8e5e10dbcb5ebd6cc7a00a724945
  1. etc/
  2. hal/
  3. vendor_product.mk