Merge "use apex_test for test apexes" am: 79cf71eea9

Change-Id: I0c74e8540a4d110904850a75c034769e478fb354