Merge "Build: Refactor and clean up runtime_libart"