Merge "Unhide DelegateLastClassLoader." into oc-mr1-dev am: b7a1be6051
am: 8ba6d5cae0

Change-Id: I35bd60232fc5def0424f06d3486ebb11efc99ae0