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

Change-Id: I509592102de377c009870842f78f9465bf9c4f62