Remove obsolete (and broken) targets. am: c757580557
am: 3654f032aa

Change-Id: Ib6a74b1b3fae70f0c838e5992f46ec10f1299fdf