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

Change-Id: If3e40fb928ab1be7d5f2947eb81340f2410df8b2