Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev