Merge "Add new DelegateLastClassLoader API" am: 1a9013a51c
am: d899c263b8

Change-Id: I937d77a969492087d21a6cf2ec542e3b4372e1eb