Android.mk: remove leftover noise from merge