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

Change-Id: Ifa20ca6aa419d80847466167d9e236a56afcbdd9