am fe9fae2a: am 5d8e4e35: Update Android\'s test configuration for new APIs.

* commit 'fe9fae2a4b167901f5101a196a10fe0b692cd285':
  Update Android's test configuration for new APIs.