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

Change-Id: I4547a1e0a9ddd380553a472fab4899d257de3506