Merge 9a085604ae9a304f2cb4056492caa47467385e11 on remote branch

Change-Id: I132042df4058ee18cccc70213abe4fdb5eac49cc
tree: baa043e5fb5c1d5ba1bea7098b80ea366e79b47a
  1. etc/
  2. hal/
  3. vendor_product.mk