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

Change-Id: I0340e87fa403a18303b0edba09980e92f51e152b