Merge "Gallery2: Fix jni build warnings"