Merge "Set compile_dex explicitly for FakeApexSystemServices" into main