Merge f580273735c0b9b9d4893e9d93bb4ca44a4aebaa on remote branch

Change-Id: I099f7cc6a6ec85023388de9f1bdd09375c26f027
tree: 6d074dcbbc2b089975efe0b60587c5eb52e9b87a
  1. etc/
  2. hal/
  3. vendor_product.mk