Merge 60554d594cb22108bca67d9566c80c513fa506d0 on remote branch

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