Merge 4f2994f0baa79311cf260f6a090ca9f8deacd0d2 on remote branch

Change-Id: If33d0ad2d0ded94288ab2147cd9596bcc356c6f2
tree: bdff41d34b4993679418ecf9a13cadffa443930b
  1. etc/
  2. hal/
  3. vendor_product.mk