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

Change-Id: I79935f02c7dfef3589c75755167a1f0b37576b7b