Merge a411f5e679bc245a3b384c1f80f4dd3190d4d5c5 on remote branch

Change-Id: I484d70bef7a45073978e9c86dcb8ed135ef93436
tree: 27d7491dd417218594eb480c04870c016be9a56f
  1. etc/
  2. hal/
  3. vendor_product.mk