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

Change-Id: If4a59c9d051f4d3dd4152f5f30da50bf5feeceaf