Merge "Migrate libcamera2ndk to ndk_library." am: b22e8ebf30
am: 15234be025

Change-Id: I2786071d091f98e96e71f546fc90742d474c02ba