Remove unnecessary variants causing apk bloat
am: 1e24ae80f2

Change-Id: Ic22740fb42d1f002e21db12f56772ce5ae0dd9f9