Merge "Run \'nativeperms\', remove Brillo #ifdef."
am: a7ba9d0

* commit 'a7ba9d0abc640e28874b2bc3a2c184603cb91167':
  Run 'nativeperms', remove Brillo #ifdef.

Change-Id: I53e34de00b5bd14e34081247be55afccba2b9260