Factor EraParser out from YearTimeParser

Change-Id: I201e94d159c728323993938e380fb196233266f5
Merge "Factor EraParser out from YearTimeParser"