Prepare for some changes to LoaderManager/Loader.

Sorry it is a bit ugly, it is to allow this change to be
checked in prior to the first stage of the framework change
without breaking the build.

Change-Id: Ic781324da69a06ef30a0b34cd4e16d561c9c7df2
9 files changed