am 0003192c: am 2bea94ba: Merge "Fix up android.core CTS tests."

* commit '0003192c32ff9672a3974709912acc853053c7a8':
  Fix up android.core CTS tests.