am 3db7a730: Merge change 4880 into donut

Merge commit '3db7a730bce818196c216945f866939bf8a7401f'

* commit '3db7a730bce818196c216945f866939bf8a7401f':
  Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.