Merge 543fe8ae09f9176d0f718e07ddc15b6bc9b01434 on remote branch

Change-Id: Ib29afb89d070cac5e57d0f1cbd4ab5871c0e2cd5
tree: 0e00bf3acd21297f6991a6d5b2e63f47cb3eb3d8
  1. etc/
  2. hal/
  3. vendor_product.mk