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