Merge "Run 'nativeperms', remove Brillo #ifdef."