camera2: Clean up cross-references

Change-Id: I7410293a13f65768a2aeed1490662735f73987cb
4 files changed