Merge "Pass system server class loader context when asking GetDexOptNeeded" am: d42527b844 am: 7d3380d672

Change-Id: I14ce3011adbabfbe1c10e31a4e0fd16fb1a4c608