AndroidManifext.xml: remove leftover noise from merge