Merge "Merge ModuleIR within single thread" am: 79f4b7a0fc am: e0de71ef07 am: 692d59ac59 am: e62b5bb167 am: 22b78a7ea2

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

Change-Id: I39fa6a982f5b142d9e8281759ea636adfc87d471