Android buildfix + cleanup