am bde1fc84: am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread

Merge commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333'

* commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333':
  (gingerbread) remove unused tests. bug:2898376