Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916 am: 807f6927c7
am: b2d74278a7

Change-Id: I559840491703444c9b20e47397b57a8a1d78b48b