Merge "Fix atoi build errors" into qt-dev
am: 9fe4ba7a43

Change-Id: I64c88c9666c208e0e80919ea4fc3299a27d09c5b