Merge be5401b50c1dd65e9058a3cff2580e43c900755c on remote branch

Change-Id: Ia4fec18939eb76e1a87e995de2a4a148c62175fa
tree: e33fd5fd8bd2e2478bee9fa112f81eec407b4fa5
  1. etc/
  2. hal/
  3. vendor_product.mk