Merge "Revert "Convert keyboards artifacts to soong"" into main