Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb