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

Change-Id: Ib59bf9c16f7f13a1cbf7cce48e9b56f77364f073