Merge "Add apksigner to otatools.zip"