Commit 03f9711797a660424965c61a06c97b870c43f9a4

Ryan C. Gordon 2016-02-19T00:24:00

Merge Android C89 fixes from Eric Wing.