Merge "Fix "Nothing to be done" messages when launching soong_ui" am: 576c76160b am: b7075868bd am: 990bcc985a
am: 05b6cf7516

Change-Id: I4e6049827c80cacf90b71bdfc36a8e4c389c8c87