Merge changes from topic "NumericShaperTest"

* changes:
  Android patch: Add tests for NumericShaper
  Import test for NumericShaper from 8u121-b13