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

Change-Id: Ie3d738623f687497cafdc38bac06074b9a6337b0