Merge "Add new DelegateLastClassLoader API" am: 1a9013a51c
am: 658dbeddce

Change-Id: I8a89318dfd91c32a6561a717adf51e0122d28129