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

Change-Id: Id49fdf3873f3e8c14d8c3c9647fa7eaa80a0a85a