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

Change-Id: I7e4944f22caf7284f9f1ea7ffa57547058d8b0c8