Attempt 2..

Signed-off-by: David Li <jiawei.davidli@gmail.com>

fix: Compiler warnings, OSX+Android Build

Signed-off-by: David Li <jiawei.davidli@gmail.com>