Add T. am: 506c71fde1 am: 64cfd39788 am: 4a2f58903d am: 4d36379cf3

Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/1703726

Change-Id: I1e5ead5ade17b7c9b57c523c5c670f2f779514e7