Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f am: c3d2fd7f2c

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

Change-Id: I43dc5f7ab580682988930b7516cd1aad6af4c809