Merge 1f656cbf3bc1a0905db3caecf0d829678dd13670 on remote branch

Change-Id: I76026aa794302734255e3454504cbad565c1ec2d
tree: 820da21750c59812addd1b67e4fe763b822612e9
  1. etc/
  2. hal/
  3. vendor_product.mk