Merge 5240584bbaa1055d610661ba5a1b84f8a64efa7d on remote branch

Change-Id: I77df238f6ed770672c4481103b4a6e4e6c25ac12
tree: 0638833361c53869e57cf4ebd707636b9da68e19
  1. etc/
  2. hal/
  3. vendor_product.mk