Merge "Expose Structs and constants in XfrmController"
am: e38fa2c097

Change-Id: I8f9a63dbffffe20573a19a6c97e1b7cd4383a4d2