Merge "Statically include @StringDef in IKE module" am: 259781e84a am: 3cd4501529 am: f49f206a02

Change-Id: Icb47ca3f788fd1ba6410156ae754ef995bf8f609