am 8b1a2774: am 754f16fc: Merge "Fix installd command line parser"

* commit '8b1a27740dc9910ffbdf0df775056b6647fe111c':
  Fix installd command line parser