Merge "camera2-portability: Make factory offer choice of backing API" into lmp-dev