Merge "Fix clang error about incompatible assignment in simg2simg.cpp" am:...

Merge "Fix clang error about incompatible assignment in simg2simg.cpp" am: e231eed8 am: a4efa031 am: 12683736

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2298857



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