Merge "Depend on libandroid_runtime"