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

Change-Id: I60f78512531294e459b836c4347350f35fec55e5