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

Change-Id: If6d5a84ef5694e8e238a703af2ae5cde0069a223