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

Change-Id: I72db6f53da9fe9273c6b210a989975b4c936d62f