Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev