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

* commit 'd430354c6b6b3b39c35e8af90007414c325ccb2d':
  Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."