Merge b2a661781298f2816d6e984ba1eda9ca4c02ef5e on remote branch

Change-Id: I8f47a522bfcfb026f69a4f3b6c4c111985829b54
tree: f9fcc459aca4b206660cfa68426b1876cef04a1c
  1. etc/
  2. hal/
  3. vendor_product.mk