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

Change-Id: Icc847ce67e783f685038f8ea97771f6dc0823dd7