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

Change-Id: I496b6f7d444f4f3efaea44da9938f615914c4ef4