Make checkCallingPermissions and getCallingOrSelfPermission work just like checkPermission
Merge branch 'master' of https://github.com/pivotal/robolectric