Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1971823 Change-Id: Iffd5773242661b768a6d8b2734d50ce4fc8d5781