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

Change-Id: Idd12382684742c7ec5d2259da4bc39fd7d5831b1