Merge 605f4b56639a02b12cf509e010aa544eb2c74c12 on remote branch

Change-Id: Id0ff665d10846c63a1ffebc44166302bda80414d
tree: 80597615a86bb514e91904c854b97e328063a968
  1. etc/
  2. hal/
  3. vendor_product.mk