Merge "Convert IScreenCaptureListener to AIDL"