Merge change 5270 into donut

* changes:
  Integrate unsubmitted cupcake change 131662: 	CTS: Added test cases for android.database.sqlite.SQLiteProgram
tree: 6104d2cebe18b344f08bdd889fa18322763a930c
  1. tests/
  2. tools/
  3. Android.mk