Merge 19cdb3d3b22dc151555ff13377cf3430c0e64f8c on remote branch

Change-Id: Ida4b1db9600cad4a89dd27e1a48263d76b15c419
tree: 5060b3800bdf6a31c222188fee2f804d1d5bc180
  1. etc/
  2. hal/
  3. vendor_product.mk