Merge "fix xlarge support in aapt for gingerbread" into gingerbread