Merge "Diff the fields located at the same offset in a class" am: 28f992d407

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

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