Add AndroidVersionUtils and DebugUtils