Merge "Only emit cat1 volatile ops in SMP builds." into dalvik-dev