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

Change-Id: I5e52b9f799028b0e25b2558741d17cd860b5be71