Merge 8935a5a898e995ba6308eb950fe640da1360f049 on remote branch

Change-Id: I77a2741846badc986530351ecc9c21e87248aaa8
tree: 155fffc2d2f4db392196ea3025d9db47c27cdaef
  1. etc/
  2. hal/
  3. vendor_product.mk