Merge "AppLaunch: Update to support iorap compilations on go/perfmaster" am: 94e5238168 am: 954c399108

Change-Id: I82d8174e406cbff19a45fba789c2c6e57659d6d4