Merge "Add FusedActivationFunc enum and renamed certain operations." into oc-mr1-dev am: 9e5c908810
am: 3c7df7d717

Change-Id: I8e9ff6601c2bf2738ce86c7937e83366096d909f