Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""