Seperate parsing functions so they can be reused for other diff
utilities

Change-Id: I1ea6ebf90ded128eec116cc1f326a28bdda2fb77