Fix strange failures on Android N

infra/bots/recipe_modules/flavor/android_flavor.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # pylint: disable=W0201
 
 
 import copy
 import default_flavor
@@ skipping 20 matching lines @@
   else:
     # Test/Perf bots.
     return {
       'AndroidOne':    'arm_v7_neon',
       'GalaxyS3':      'arm_v7_neon',
       'GalaxyS4':      'arm_v7_neon',
       'NVIDIA_Shield': 'arm64',
       'Nexus10':       'arm_v7_neon',
       'Nexus5':        'arm_v7_neon',
       'Nexus6':        'arm_v7_neon',
-      'Nexus6p':       'arm_v7_neon',
+      'Nexus6p':       'arm64',
       'Nexus7':        'arm_v7_neon',
       'Nexus7v2':      'arm_v7_neon',
       'Nexus9':        'arm64',
       'NexusPlayer':   'x86',
     }[builder_cfg['model']]
 
 
 class _ADBWrapper(object):
   """Wrapper for the ADB recipe module.
 
@@ skipping 287 matching lines @@
                      infra_step=True).stdout.rstrip()
 
   def remove_file_on_device(self, path, *args, **kwargs):
     """Delete the given file."""
     return self._adb(name='rm %s' % self.m.path.basename(path),
                      serial=self.serial,
                      cmd=['shell', 'rm', '-f', path],
                      infra_step=True,
                      *args,
                      **kwargs)