Merge "Added decoding of truncated AAPT string lengths." into pi-dev