Merge: Clean up GCC warnings on Android compilation