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

Change-Id: Ibf9b9a2b8ba9c24a4110c94d9c2792023d065684