[automerger skipped] Add ELU and HARD_SWISH am: 503d850369 am: b17645bc30 am: 3b5da8539e -s ours
am skip reason: Change-Id Iab8da2a666ad9775dfb53d9297e94962fb651353 with SHA-1 aee67f83f9 is in history

Change-Id: Idfcc378261cee8c6aba05539b96bc04d9e2179fd