Fix wrap property creation when truncating.

If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947

(cherry picked from commit e32df45f)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b