Merge 979d3274a11377ced05a9db23a2d5a793c4d877d on remote branch

Change-Id: I178b22571760159bfcd2d45a247de353b54160a4
tree: 6a895ebe3860308618bfee7cc0fdd514135bc4de
  1. etc/
  2. hal/
  3. vendor_product.mk