Merge "Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43 am: 4ab10d710e" into qt-r1-dev-plus-aosp