Merge "Fix the fix for 9patches." into honeycomb