Merge "Fix build failure in scheduler_arm with ART_USE_OLD_ARM_BACKEND=1"