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

Change-Id: I1542591e5fe4f5d8ef8a94f3d424664ce32ef1d6