Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."