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 am: f7038da4
Change-Id: Id8360fe0e78e3c4acc2261ee7a50d7916b3bfa36