Android 4.0.4 release 2
Fix invalid C code found by gcc-4.6. Change-Id: Ib76086577a8b1a6567d91751e137f550ca64a288