Merge "Fix computation of 'entry_length' in AAPT2 container format"