Merge change 11284

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