1b66f6e9d7
Currently this is on everyone's include path and is getting exported via the NDK. Change-Id: Ia417839fb65c7e0afddcd9fae3438665dae8e752