merge from donut
tree: 997842f910f219252f239a7aad25eaabb150891b
  1. android/
  2. pppd/