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

Change-Id: I9f326a8070b2c0253a33b59f8122778bbb1caa40