Revert "Fix another source of undeterministic inlining." DO NOT MERGE

This reverts commit bd7eef17de5f3d25f411702f9f260a96455b4cf7.

Bug: 24467386
Bug: 20037935

(cherry picked from commit 39becb96f0c2ba1823ca0cf046e9f12344f9f3bd)

Change-Id: I3ebdc669dc3085570bb534dce710712bf3ed25e2
1 file changed