Merge changes from topic "nnapi-control-flow"
am: d7975bf8d5

Change-Id: I0de4c13d0ad4790282cc41283c64cf56875240d5