Merge "Clean up how primitive types are handled." into dalvik-dev