Merge "android/perms.c: clean up error handling"