Merge 987d66ed705d0a3c3e3493cc6d64a6d932994c70 on remote branch

Change-Id: Idedf7df4b83471f4365fb860692a7c64a43b4565
tree: 11f0318e77177629382b60319d8c42607ae44c9b
  1. etc/
  2. hal/
  3. vendor_product.mk