Merge "Convert CanvasCompare/Android.mk to Android.bp" am: 17da00b993

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970059

Change-Id: Ia10f0039119ed2fa6686db4cac771b363a9169c5