Merge "Exposed Android.bp shared library target for libcamera2ndki (cherrypick)"