GitLab

Build fix. We're over the dex method reference limit.
Removes part of commit 8f0d92bb.

(cherry-pick of 5f17cb094449b2667f0fca5988da6f5b103161f9.)

Change-Id: If47b84c0baf2621e59ab262a0f9c088d98f5e33f