Merge "Remove USE_SOONG=false option" am: 5413fb4b3e am: a36de73331
am: 44cf069b30

* commit '44cf069b301e8fcac1526255e1485307e8703188':
  Remove USE_SOONG=false option

Change-Id: Ie76cca638647422d1298659e6519cfd004b3cd75