Fix tests for soong change.
am: 45f1d99044

Change-Id: If6ae1bd5b62e5ffded81abddb04b4b84539fb365