Merge "Add xfrm stats to dumpstate"
am: 661d91e832

Change-Id: Id935abb239175464161d44f08dcd1c668a10d13e