am b145ad1d: am fc32a062: Merge change I88721afe into eclair-mr2

Merge commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc'

* commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc':
  Fix bitmask in aapt's StringPool length construction