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

Change-Id: I30d69dad713169ddb933f24b97a8a9642e458304