Cleanup Android.mk and add a fixme for the CUIMG path