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