Merge "msm: camera: add req_mgr tracepoints" into dev/msm-4.9-camx