Fixes: 202886196 Test: apkanalyzer--apks are identical Test: Treehugger Change-Id: Iff24028632c4b6929c408db2dbae9a3d98604810