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

Change-Id: Ic432517f3e2631174b0b0b18abf8943e06b654f8