Merge "run-as: Keep supplementary groups." am: e80beca255 am: ee4d611c46
am: 8740d88c66

Change-Id: Ia52bcbfac0059c1b7176bcd80916739ffdd28a4f