This problem was affecting Android builds with gcc/x86. Change-Id: Ibb7978413c89bd1ac09f0d1ea78f5cb4fe61f6ed
61220e88
bbbab26e
2c180499
9645081c
43707a83