Revert "Fix incompatibilities with Kotlin 1.5.0" This reverts commit b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911. Reason for revert: b/187908823 Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d (cherry picked from commit c5b4071877530ba3eb6ce5f55fc8c101ea1f35e4)