Merge "Fix aapt dump badging to support xlarge screens." into gingerbread