Merge "Remove code that break androidx build." into main