Merge "Remove obsolete android/protocol/ directory."