am ca724ef7: Reduce StringUtils dependency on the Android libs

* commit 'ca724ef71f70044f48e2360e2627922be8ca24d5':
  Reduce StringUtils dependency on the Android libs