Changing no_instrument flag to not instrument the android library only, since that's the big slowdown. Some cleanup.