[cleanup] Cleaned up ApkLib generation, fixed issues with IntelliJ