[automerger skipped] Clean up the legacy loader
am: 9ef62ac514 -s ours
am skip reason: change_id I3ea4e40cb986b380f3b79a7685c3c09633e4d199 with SHA1 097205c8e1 is in history

Change-Id: I800bbe694a6879955ea07bfb830f60a811de0710