Merge "Add missing memory barrier." into dalvik-dev