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

Change-Id: I599019d3a65903a3f339ac48cf1dd0400d87b958