Codecleanup and libandroidsupport update

mostly finals