Merge change 5231 into donut

* changes:
  Integrate unsubmitted cupcake change 131601: 	CTS: add test cases for database.sqlite.SQLiteQuery and SQLiteDatabase
tree: 948637c47262610445d182d4e76460a3b42e73b6
  1. tests/
  2. tools/
  3. Android.mk