Merge "Pass system server class loader context when asking GetDexOptNeeded"