Partial revert of ag/25744360

This CL partially reverts ag/25744360 given that we now use a more
recent version of the Compose compiler, both with Soong and Gradle, with
which b/317972419 does not happen anymore.

Bug: 317972419
Test: atest MovableElementTest
Flag: N/A
Change-Id: Icea7ab6fe65baf0190c4e66a0dca58b6cc3a7df4