Merge "edify: Remove edify_parser." am: 281d4eefb1
am: dfbe70b79d

Change-Id: I74e065a440dd3397e3a3b04b73c115ff1b33351a