Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91
am: 04a6af06fb

Change-Id: Ia350bfeca1b8d32a4d30efcae78eaac5ea8c93a1