Merge 4a4539183fb73c0690fe9a746757348ff3efd6ec on remote branch

Change-Id: I87095984527a159ab861453c0062f6cbb51e0c8a
tree: cc8ee128be5288986afd5ced2c96297f3206bf31
  1. etc/
  2. hal/
  3. vendor_product.mk