am 775a8df6: merge from open-source master

Merge commit '775a8df614d364fcb82e280069a3f533381240b4' into kraken

* commit '775a8df614d364fcb82e280069a3f533381240b4':
  adb: Add persistent system property for running adb in TCPIP mode