Merge 558a3f36f45e7532ee9ffed7643691a733c4c04a on remote branch

Change-Id: I0a31e52d556ba9635c63207294de71fcca0543e8
tree: f78cdf74571b9ad937ed8a88392cf931be99d9d3
  1. etc/
  2. hal/
  3. vendor_product.mk