Merge 550adf5f8d5ac08fa0f9fd627baaf7f1b830b807 on remote branch

Change-Id: I4262173acb474a7be58b687e04a1235036d11e92
tree: 7cd66396688ca319bbf055e82f2e17b9ae91a09c
  1. etc/
  2. hal/
  3. vendor_product.mk