Merge "Camera service: Fix dump() for treble path and rearrange it"