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

Change-Id: Ic237295592564f32f6b916eaab3bdd5f85cf2017