GitLab

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

Change-Id: Ia526ba7444fc1861f9b922c25e83a97ce3f32cf0
(cherry picked from commit 5f17cb094449b2667f0fca5988da6f5b103161f9)