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

Change-Id: I9a9913fa0377534a803bf179ac03d5db284ec579