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

Change-Id: Ic181243ba4647136f64712162b5568b123fa23ef