Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev am: 0f7ec0231c
am: 8cb92ffc69

* commit '8cb92ffc69c6f475ef214d0ff323f15f22a3035d':
  Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs