Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev am: 420e3be1 am: 6ebbfba8 am: 830b5ba6 * commit '830b5ba6': Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"