Merge 77fa61a51bea1ba2349a1f15dc7f8321951b9efc on remote branch

Change-Id: I2ee69781205233be8b31e413caf2cd7fa2c2915b
tree: 60521e8e64211a1d212c4c430eac7506d2f657c4
  1. etc/
  2. hal/
  3. vendor_product.mk