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

Change-Id: I634496e0b0887e18fa39be5b8fb380d3780b4f17