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
Change-Id: I53bf1c771aca31df81638e5b5fae21b77cf2056a