Merge change 4880 into donut

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