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

Change-Id: Iae0842ee03894ff26f834ef2862355b69648e03f