Merge "envsetup: add quotes around PROMPT_COMMAND" into cm-10.1

Change-Id: I1a289f8744c2724b4ba629f67a49e18bdd528cf7