Merge "Ensure that all Breakpoint.java files are identical for CTS"