Merge "Simplify catapult build" am: 361fa3a8cb
am: 898d8ad498

Change-Id: Iaac09954e3123db7648022add74f9b663bb22ec9