Merge "use apex_test for test apexes" am: 07e74d65a2

Change-Id: Ib3721ce4347f59283cbe7aca4d58916419db1b0a