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

Change-Id: I58adff431243e0eac262c035284abc2401225b38