Merge a21118745414f795d1b723c3a8ebb5fff2898d49 on remote branch

Change-Id: I5c58d8adcf8af07e86656e1b7f1d4edea49720c4
tree: 5d18f65694dab914c04d56c8fa37d1be10ad140a
  1. etc/
  2. hal/
  3. vendor_product.mk