Merge "msm: camera: Change Avtimer timestamp implementation"