Merge "Simplify catapult build"
am: 361fa3a8cb

Change-Id: I306659ddf2cb3217f273df347c4bf37ffcca5be9