Update from https://crrev.com/308331

build/android/tombstones.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 #
 # Find the most recent tombstone file(s) on all connected devices
 # and prints their stacks.
 #
 # Assumes tombstone file was created with current symbols.
@@ skipping 155 matching lines @@
 
   # Sort the tombstones in date order, descending
   all_tombstones.sort(cmp=lambda a, b: cmp(b[1], a[1]))
 
   # Only resolve the most recent unless --all-tombstones given.
   tombstones = all_tombstones if options.all_tombstones else [all_tombstones[0]]
 
   device_now = _GetDeviceDateTime(device)
   for tombstone_file, tombstone_time in tombstones:
     ret += [{'serial': str(device),
-             'device_abi': device.GetProp('ro.product.cpu.abi'),
+             'device_abi': device.product_cpu_abi,
              'device_now': device_now,
              'time': tombstone_time,
              'file': tombstone_file,
              'stack': options.stack,
              'data': _GetTombstoneData(device, tombstone_file)}]
 
   # Erase all the tombstones if desired.
   if options.wipe_tombstones:
     for tombstone_file, _ in all_tombstones:
       _EraseTombstone(device, tombstone_file)
@@ skipping 26 matching lines @@
 
   tombstones = []
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)
 
 if __name__ == '__main__':
   sys.exit(main())