AI 144808: am: CL 144804 am: CL 144802 Bringing SQL down to zero broken tests. Restructuring
  some overengineered tests, so they are able to execute
  in the CTS host and our CoreTestRunner.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144808
16 files changed