Merge "msm-camera: Remove AXI Reallocation"