am 4be4e537: merge from open-source master

Merge commit '4be4e537f513e5ee6534750852afb145d144a465' into kraken

* commit '4be4e537f513e5ee6534750852afb145d144a465':
  adb: Add persistent system property for running adb in TCPIP mode