Revert "Refactor code in inliner."

This reverts commit 921525030301fd4b8f6bb83aa6b20160d802e689.

Reason for revert: Potential cause of b/186637642, b/186637642

Change-Id: Ia6f5cb742a068f148e290071cb0675648b22ec86
3 files changed