Merge changes from topics "nn_hal_fp16", "comparison_ops" am: f771d0f183
am: ecbee9fbdc

Change-Id: I9be6db397363842dd7f5bdc3266c98af3e6375b9