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

Change-Id: I25b1286c5da4057817b176e07b490fae5b6405ff