changed proximitykit-android symlink to point to gamera-android, and made the equivalent change in scripts/merge-aar-files