Merge "Gallery2: Fix jni build warnings"
am: a5627ca40f

Change-Id: I123ca056d44ae3b1d8796e044323b0f8f6efe1c1