Merge "Place compat tests in intermediates dir, not on /system"