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

* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
  Fix up android.core CTS tests.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build