Remove optional inclusion of Elastica. Not like it would do any good if it was missing

Change-Id: I26c77a29dab9d95439d0f1dee6edc6a8a2a8e49f
Merge "Remove optional inclusion of Elastica. Not like it would do any good if it was missing"