updated CategorizedAndroidSourceSinkParser