Merge "Fix braino in scheduler_arm.cc" am: 1c3f8ea47c
am: bbc9370f4c

Change-Id: I2c60862b1bcc977b2e4d975a9999893f827eca48