Remove obsolete (and broken) targets.
am: c757580557

Change-Id: Ic7fac78633221d4d3dee6b9ab3d578ff05116e6c