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

Change-Id: I670b785f20eeaabba3d67abd8f0bb7e5153c01b4