Merge 23c222dd049d96915779c3d072e7a63367c04c81 on remote branch

Change-Id: Iab8554133698dfde9d2461dd4e4d1bc9973aad3e
tree: 68a00ae32cd007f80c829414725ccf29814fccc3
  1. etc/
  2. hal/
  3. vendor_product.mk