Merge 23c222dd049d96915779c3d072e7a63367c04c81 on remote branch

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