Fix apktool compile errors from firstpatch and rejects