Merge f0cbc053826b69e4704456331aba6109b34ebd75 on remote branch

Change-Id: I05d7e5d9260babc0e4341585bebeb33ac24347b2
tree: d9cb49d0927b1465c73b97ca6dc544fa6cee2017
  1. etc/
  2. hal/
  3. vendor_product.mk