These are changes to fix various compiler warnings generated when I was fixing Android Studio build problems, but aren't specific to Android changes.