Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev am: cd99932241 am: d4af8c13ac am: 387cd16920 am: ab418f36ec am: 2cd3bb53b5

Change-Id: I679448bff90431dd3f82ea9c43820477c383074b