Merge "use apex_test for test apexes" am: bef404385c am: 88f3565a92

Change-Id: Ib33ff9fc78d960c11daf3544d0f83a03afcbfebb