Merge 721d2e2a198247090c59379546af81e83c710321 on remote branch

Change-Id: I275aab7c4206b31743d3221e0a3e57abff4e54a9
tree: b6f64794a218c21453e704510d4f7bc53a41a321
  1. etc/
  2. hal/
  3. vendor_product.mk