am 868805ae: Merge "Change which backdoor the tests goes through"

* commit '868805aec49ec1ee5e60e787c23e838ed9f55fb3':
  Change which backdoor the tests goes through
tree: 35305b37a2672328968425846ef83ec35f97c0fc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk