Merge "Do coverage tests on package.apk.unaligned" into gingerbread