Adnroid buildfix, we have too many makefiles.