Initial ApkHandler commit