Merge 60554d594cb22108bca67d9566c80c513fa506d0 on remote branch

Change-Id: I04622426f48bba0b2e7cd0c6f12e78db0c719552
tree: 601928b9af0d8d87530bb46a1eea7d53eaa8b6f6
  1. etc/
  2. hal/
  3. vendor_product.mk