am f45516ef: Remove build warning due to test cleanup

Merge commit 'f45516ef7d5a1199b88b44e24d9568a4e018ffd7' into gingerbread-plus-aosp

* commit 'f45516ef7d5a1199b88b44e24d9568a4e018ffd7':
  Remove build warning due to test cleanup