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

Change-Id: Idfd3a9c34852d3e7b29dd4f324bd69da7c12674d