Update to new Loader APIs.

Change-Id: I4be23901304890e1d0237d81e6cfb3889d5b6591
8 files changed