Merge change I88721afe into eclair-mr2

* changes:
  Fix bitmask in aapt's StringPool length construction