Merge "Fix missing offset for apk."
am: 9a00f596d3

Change-Id: Ie4a9074591aef5869479dc6f872bff8ae1d54dee