Merge "Fix computation of 'entry_length' in AAPT2 container format"
am: 6e914e8baf

Change-Id: I4dba5b88e41745a04146f98d874f9988538002a9