Merge "[incremental/adb] fix signature size check" am: ef73f25db6 am: fbcc431f56

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373276

Change-Id: I5c653e463611670f7ad9e998c022a61517792a90