Android 5.0.0 release 7
merge in lmp-release history after reset to a1067c8d2b2165f1058a3a8216bed4efacfa1c80
tree: 551acbe6cd529cc0f13c036822986da3c8586c9b
  1. client/
  2. include/
  3. server/