am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread

* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8':
  fix xlarge support in aapt for gingerbread