Merge "Track getxattr API change" am: c4c4a1e76e am: f897e1c3b6 am: 2b5a0d299d
am: be5137f4cb

Change-Id: I6a9f9b807b8dfc4aed83fe7d2610033dc63e4269