Merge "Turn USE_SOONG_UI on by default" am: 39a6418d76
am: d9b773845d

Change-Id: I3c68df14dc3fcd8152075186404ffe5a8f4fe19c