Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev