Camera2 tests: Update for framework changes

Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2 files changed