Merge "Use soong_ui directly, instead of make" am: e994b4b584
am: 0531e5c647

Change-Id: Ic3fc61824852181512f941dbc57c158540546616