Merge "Camera2: Switch to using ATRACE"