[automerger skipped] Merge "Remove various bits of dead code and unused workarounds." am: b9c95f8e6a am: 9f11ee4e95 -s ours
am skip reason: Change-Id I68fcd5da304d04ff4da3c3f3712fb79ce6b5791e with SHA-1 c8a43605c3 is in history

Change-Id: I94bee87fd647975f68f0beeb50415a86086bd37a