CL-64898: fix bug in apkcerts.txt, otadiff, ota.phone

Change-Id: I46763e403d168492a8d7fde56fca5f1f440df520