am b8729910: Integrate unsubmitted cupcake change 122861: 	CTS: add test cases for android.content.AsyncQueryHandler and ContentQueryMap

Merge commit 'b87299103d8b2e2714beb901f2ae2efd45333a49'

* commit 'b87299103d8b2e2714beb901f2ae2efd45333a49':
  Integrate unsubmitted cupcake change 122861:
tree: c052c35d9642dd3704f66d5c8fd88704d17e0a28
  1. tests/
  2. tools/
  3. Android.mk