Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b

Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: Id5ed56ed3d7f4431457d776499f010c53ed4daf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>