Merge "Remove stale comments and kDebugLocking check" into dalvik-dev