Merge "Clarify NNAPI control flow shape constraints" into rvc-dev