Merge "Improve diagnostics when RegisterNatives fails." into dalvik-dev