Merge "Added a barrier to final field updates." into dalvik-dev