Remove small and tiny method options
am: 4b3946a555

Change-Id: If3bc224da244c56a8eb7859b7343fe898f06b66a