Merge "Fix 9patches, again... Bug #3365243" into honeycomb