am 360786f6: am 5fa81330: (-s ours) am de8ea778: am b2481354: Merge "ddmlib: add a couple of system property names" into studio-1.3-dev automerge: 2cdc224 automerge: 5b7246a automerge: 5fdffe9

* commit '360786f62c0e2ef34ca2c6fcd0fc8e5e66a0716e':