Merge "Update catapult and how we update catapult"
am: cd89f5ab72

Change-Id: I575a9fffe2bfd11f42ad07b8ee22b3a4f8207026