Remove workarounds for fixed bug 18051191

Bug: 18051191
Test: ART run-tests
Change-Id: Iae9b1ed30f26dbe8efb291d71d7224e64eea14df
67 files changed