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

Change-Id: Idc0e79a24bed75df4debe2f5b0f085724cfb8ba2