Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev...
Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev am: cd999322 am: d4af8c13 am: 85631ef5 am: f6ad4478
Change-Id: I8913b8646bd53b5291d490e1ad73fee09cc0d507