update framework, fix android compile errors