Merge 02fe60d2426449d6f61f46db94403b398fc3167c on remote branch

Change-Id: I049a58ce84d0177c89e8d0577deda53bab8c23e3
tree: 265c1126114cb0f5b40dd00b0bd360395a968f46
  1. etc/
  2. hal/
  3. vendor_product.mk