Remove options deprecated by the minimum required Java version

Change-Id: I03ba7aebc85f456ce0cf4199781a24a54fde5e30
Signed-off-by: Nitin Dahyabhai <nitind@pobox.com>