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
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..89b446a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+ccross@android.com
+dwillemsen@google.com