Merge "android/perms.c: clean up error handling" am: 26ab9ecf59
am: afa0fe5265

Change-Id: I64af6ee708ddf399af431718aad3a031decf8ba4