4.6 merge: ARMv5 sync_synchronize failures