Merge ce3166ce458fa9eaa71197cf4d957d3e89721e44 on remote branch

Change-Id: Idfc9cb9747a9957d2220359a7bc6e2fb9d53e3a4
tree: f88e073d5c4db420d763874c7698b3db4d3caadb
  1. etc/
  2. hal/
  3. vendor_product.mk