Use std::u16string instead of android::String16 due to API change in libpac
am: 64c3f6d6ba

Change-Id: Ia67f9802dd350ffdf740c9689abdbc0ffc5ac303