Merge 28a3fb32135cd5769c2e7ff4a4cb104add328b8c on remote branch

Change-Id: I916b250e6b90f5bcdce65660dbce5bcafaeaadac
tree: e8f74559cdd5619e93c56cb801fdfcde83a63ec4
  1. etc/
  2. hal/
  3. vendor_product.mk