Merge "Remove redundant "#ifndef NDEBUG" guarding asserts." into dalvik-dev