7e73760cd0
Compiler is not promoted to mainline yet.
This reverts commit 2f97f17df9.
Change-Id: I7256aeb3698ee3ae640a9f457a929abe24d5ef17