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

Change-Id: I2d0f4b6337143d95051339ef8e1535fcfbf689bb