Merge "Convert keyboards artifacts to soong" into main