Merge "Merge ModuleIR within single thread" am: 79f4b7a0fc am: e0de71ef07

Original change: https://android-review.googlesource.com/c/platform/development/+/1411807

Change-Id: I3bdbfc4da8fc5ad2da3cf49278fb626570474a05