Merge "Track getxattr API change"
am: c4c4a1e76e

Change-Id: I66059536d5dfb0999743656f095d557ddf25ff70