Merge "Revert^2 "Add apex com.android.runtime.host artifact""