tree 2c81a80889b4007a84df349ef2c9013991824d55
parent ab87b42182b234e2b8325e5f5036a75fe82cf9b0
author John Reck <jreck@google.com> 1476987692 -0700
committer John Reck <jreck@google.com> 1476987692 -0700

Simplify catapult build

Test: manual, built & ran sdk systrace
Change-Id: I68f442038d889dcf4d8329b92034df1cb75a570f