Merge "Don't allow class status to go backward except for error." into dalvik-dev