Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Improve indentation for multi-line expressions
  Disable parallel compilation when using race detector
  Return an error when renaming a module that doesn't exist

Test: m blueprint_tools
Change-Id: I5446f0c6903895deca541f1ffad88051698998e1