am f5ed55c3: resolved conflicts for 3ad4e29a to mnc-dr-dev-plus-aosp

* commit 'f5ed55c37ec41d92e27c1ed17b9cee28bee3dec7':
  Update platform tools version to .1.0 alpha1