moved PF to buildAPK.gradle
refactoring gradle Tasks