Merge "make SignApk faster for OTA packages"