Merge "Ensure that all Breakpoint.java files are identical for CTS" am: 9ea6cad292 am: 1ad75a43c8
am: f61365fb1f

Change-Id: I927c05e46c23a319f3f01c24949602148d4a954d