Merge "Merge "Make ApexManagerTest use resources that are not prebuilt" into...
Merge "Merge "Make ApexManagerTest use resources that are not prebuilt" into rvc-dev am: cd999322 am: bb88d927" into rvc-d1-dev-plus-aosp am: cbaa57dd
Change-Id: I6ecbff75b159ff4b9e02991d1796f121fb9c423c