Merge "Add ANativeWindow timestamp support to camera service."