Merge "Remove dead obfuscatory code." into dalvik-dev