Merge change 5430 into donut

* changes:
  Integrate unsubmitted cupcake change 131160: 	CTS: add test cases for database.sqlite.SQLiteQueryBuilder, SQLiteOpenHelper and SQLiteCursor
tree: 465c19814fdd5ff9e0bcde7ee0067e2bf600e244
  1. tests/
  2. tools/
  3. Android.mk