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

Change-Id: I3d9f64d7f1e91be0a73d5e2145eafd2baf04f38c