Merge "AIDEGen: Clean up dead code in ide_util."
am: 80eac55218

Change-Id: Id1c61f9c55258e313138cf86195b68ae0707b1c9