tree 950f4293289bdb5fce15f531049d9457b9b06875
parent 732463d058b613d32b8f141f69cbb6b8cc3e069f
parent f5c86dc1c113dc2a898311ee4d446a9ab3ed8e72
author Colin Cross <ccross@android.com> 1539215101 -0700
committer android-build-merger <android-build-merger@google.com> 1539215101 -0700

Remove workarounds for b/79755007
am: f5c86dc1c1

Change-Id: I5bb981fdf807749c88492dfb2c24ea8b936992cf