Merge "Remove native code from test 944 for CTS"
am: 4a4e245a63

Change-Id: Ide22ef4ab749731763334593bdf923358cc0542d