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

Change-Id: Id9b5c34854aa55ee988707ed823e657dc92fd25e