Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.

This should enable the ApiDemos sample tests to run continuously again.
2 files changed