Merge changes from topic "nnapi_test_dynamic_reg" am: 6568622209
am: 0ac1896ef5

Change-Id: I069481fd6df14709cc14ddeace3f927d46e6b6a5