Merge aaf7dd77573a21d98456e9faa110d4f83d0dcad3 on remote branch

Change-Id: Ib1cff73c87ddf2e8dad3e15cf411458936fdad3a
tree: 046884793b1792d56077ff4e4d7b866563053544
  1. etc/
  2. hal/
  3. vendor_product.mk