Merge "Remove nativeperms." am: cdb84a375b am: fbb699d0c4 am: dd5472bc52 am: 7dde9178e7
am: 7eda031afe

Change-Id: Ie6a7a551f88822ac5bebbc8db451ced1943c1010