Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a
am: 35bdbdfdc3

Change-Id: I6192fdd7cc02a3dea8ede2e98de3df8c51cdd7cb