Also fixes bad old-style thumb 9-patches. BUG: 11030706 Change-Id: I51abba952acf87586449fbda329212b435d1d6df