Merge bb949e69d834c58d33a42438938ab092251167c3 on remote branch

Change-Id: I3318e5c4a991edb6aa601f3c6af384f8102fd3d0
tree: fd3cdb24399759f0e73a182ffd23635c2ddb88e4
  1. etc/
  2. hal/
  3. vendor_product.mk