Merge change 9515

* changes:
  Adding "test context" to AndroidTestCase