Merge "Remove calls to VMRuntime methods that are no-ops."
am: ca1c6419c3

Change-Id: I87116d8811ffb4f0193e4091544bb82020d8e313