Simplify catapult build

Test: manual, built & ran sdk systrace
Change-Id: I5a5dd840d9bec3a892fdb735f902bb315205f426
1 file changed