Merge "GID-based permissions are defined by "android"." into lmp-dev