Merge "Migrate to the new apksig API"