Merge dfb2e27ae212cfd1ea34d47de53d312d1c716924 on remote branch

Change-Id: Id521bf9069c7bee986d94e027ceaf9ae9c092f94
tree: 6d4162d7ff48407b2bac4add55bab5e3d88a58b9
  1. etc/
  2. hal/
  3. vendor_product.mk