Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324 am: 23edee830b am: 5d01e7ec33 am: 63426347e1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1700134

Change-Id: I51466537f16d2a300775343b291b578285e9b3be