Revert "Additional cleanup prior to adding the runtime stubs"

Revert submission 2929615

Reason for revert: b/328225000

Reverted changes: /q/submissionid:2929615
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de57c7a324b405fbbfe887b2512afa1845083f2d)
Merged-In: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9
Change-Id: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9