Merge "Have installd use ART binaries from the Android Runtime APEX." am: 9b82213a87
am: e5e4501c4f

Change-Id: I27ef10b486f878596a27196e9594ad76083b9222