Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 am: f0515e4a16

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1971823

Change-Id: I19cdea077f3586b475ef1d3772c889bed5766497