Merge "Convert Android.mk to Android.bp" am: 301483980c am: 75436afd61 am: 84ed246fbe Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1690365 Change-Id: I509ab3fb820d34dbcfeb500a06e1cdaacdbaf2fd