Merge "Don\'t use su to when calling am or dumpsys." into nyc-dev
am: 7363baf

* commit '7363bafd0a94aa98a267edbbcb27abc9ef72f1dd':
  Don't use su to when calling am or dumpsys.