am 3f74ff4d: (-s ours) am 5041b71a: am 14d04b01: am fae2964e: resolved...

am 3f74ff4d: (-s ours) am 5041b71a: am 14d04b01: am fae2964e: resolved conflicts for merge of fa2b535e to klp-dev

* commit '3f74ff4d':
  Create a theme test in cts 1) Move android.host.holo to android.host.theme 2) Migrate other tests from android.holo to android.host.theme 3) Skip theme test for watch and tv