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: 387cd169 am: ab418f36 am: 2cd3bb53
Change-Id: I679448bff90431dd3f82ea9c43820477c383074b