Merge "Fix build failure in scheduler_arm with ART_USE_OLD_ARM_BACKEND=1" am: b4fe268625 am: 35602975ea
am: f6a4c99131

Change-Id: Ib6dfdec99af5d468e778c203de11de94a6fecf54