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

Change-Id: Ibc5f14f6711a51c839dd418751b4b3c6e7a27868