Merge "Remove USE_SOONG=false option"
am: 5413fb4b3e

* commit '5413fb4b3e2310be8568f5024fdc4d0900bf9f9e':
  Remove USE_SOONG=false option

Change-Id: I83c44d57917a10838dd9626d382b4e992c58f822