Merge "Exempt ApexTest.testApexType for GSI" am: eab6590c21
am: 9452165669

Change-Id: I44ca55edd5aa94cfcb7c9f468c36e2dc7dba9e16