Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev