Fix windows build issues for Clang.

Change-Id: I7a388d67a5f2c67b4c0bc73b34f50f286f254d41
Merge tag 'android-4.3_r3.1' into jb3

Android 4.3 Release 3.1