Merge "Make mainline IKE statically include Android StateMachine"
am: c0f518b2d3

Change-Id: Icdb70ac2e10c5d206e87a5da8731dfd5a980852a