Merge "Push dropbox logging into libcore." into jb-mr1-dev