Merge eb92b2c4028351f1fb1d5a5dccbf344cb47a0e33 on remote branch

Change-Id: I4d1c2c497510d6065fd97afd1435d36818d555f3
tree: 949a071390498a8cb64db8ee55681e7dfad328a6
  1. etc/
  2. hal/
  3. vendor_product.mk