Merge "Remove native code from test 944 for CTS" am: 4a4e245a63 am: 685073b15d
am: 857ac26181

Change-Id: Ic4e31d3bf6e75fe4763cb15da09ad6693d8f465c