Merge "Move interfaces to core/java for porting parser 2" into main