Merge "Fix the NNAPI HAL documentation about ADD and MUL" into pi-dev