Merge "Make TextClassifier.getLinks(...) a default method." into oc-dev
am: d80e82f917

Change-Id: Icb9dd84d761f15b230c44ab55ac050750978cc8d