Merge "use apex_test for test apexes" am: bef404385c

Change-Id: Ib09ac45b88d9f64e66954700aed6a14db1cfedc4