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

Change-Id: I5ef2f58b01632438702ac3bebb19b61000016dfe