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

Change-Id: I9322ea6bc0b123b86846d9497c034652500aef2d