Merge "Revert "Have installd use ART binaries from the Android Runtime APEX."" am: e6fa79383b
am: 7207fa0692

Change-Id: I277ea47a0fc52d9a55fc0e416727a22cfa89b29c