Merge remote-tracking branch 'aosp/upstream'

There was a regression in the previous merge.

f124de0 Put a whitespace for subshell before a close paren
ce7a2b4 Add a whitespace after an open paren for subshell

Change-Id: Id14d00bc0549e37a8c0e0b8990753b4f74f3a538