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

Change-Id: I0e01c87c3a29ee78ecbf44394dbfc5fccd5de4c9