Merge "Spec/implementation harmony." into dalvik-dev