Merge "Add ELU and HARD_SWISH"