Merge "use apex_test for test apexes" am: 79cf71eea9 am: 7f4566835c am: 0848bf51f5

Change-Id: I23a5bbf4e26087412fcc3c031961ed744cad0bf4