am f86b0496: am aec43a12: Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."

* commit 'f86b0496b5c1a7f8bdd841c6979df8061eeef150':
  Use TEMP_FAILURE_RETRY, always build bootchart.cpp.