This reverts commit 62d218d4. Reason for revert: atest InstallDexMetadataHostTest Change-Id: I6c640ac6dc54f0890e07448cf48893d298208a75