Merge "AIDL-ize InputManager IIputFlinger interface."