[automerger skipped] Merge "Clean up the legacy loader" into qt-dev
am: 1dbd80a92d -s ours
am skip reason: change_id I3ea4e40cb986b380f3b79a7685c3c09633e4d199 with SHA1 097205c8e1 is in history

Change-Id: Ib780abdcb1e60212e6d0ef986788dacbca6e1468