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

Change-Id: I4b65b7f8e5ce5737b797815178811b2c3668ba07