Merge 3b7da30fbe6d62d77d28911881f1ab6e7688cccc on remote branch

Change-Id: I27d0114ce8e593d8f60db49d8d79d0056b4dbebf
tree: 004909b2232f6c4a7377a476d14f79400f107f15
  1. etc/
  2. hal/
  3. vendor_product.mk