Android 5.1.1 release 3
am b244de10: Merge "Remove obsolete android/protocol/ directory."

* commit 'b244de10aac448aa9a51cf22d7bc420170dbf215':
  Remove obsolete android/protocol/ directory.