am 0d3999f7: Merge change 26942 into eclair

Merge commit '0d3999f788eb01baa8ba671878387761cbbbf861' into eclair-plus-aosp

* commit '0d3999f788eb01baa8ba671878387761cbbbf861':
  Minor cleanup of profile and compile logging.