Merge 3588b4ba134a54bd94edf1348433d46bbf98ed57 on remote branch

Change-Id: I08b4b509cc4c9c39df7a4e4fda393342daa8c07b
tree: f1468d674de7ab063a2c90dee3eea529dbe31140
  1. etc/
  2. hal/
  3. vendor_product.mk