Merge "Rename android16 kernel configs" into main