Merge f5cf2380b1f28feba94a6c9e377cba61ba739ace on remote branch

Change-Id: I17742016d1eacb32d51fadef873fb741dae7f95f
tree: cdcd3b334552ff537220dd94d41f7bfea26e4fb9
  1. etc/
  2. hal/
  3. vendor_product.mk