Clean up for eclipse dev on Android