[automerger skipped] Merge changes from topics "nn_hal_fp16", "comparison_ops" am: f771d0f183 am: ecbee9fbdc
am: fcb19a8c96  -s ours

Change-Id: I69358a3e75aa4f8ef691abe559a3cbc670c4e453