This two lines are the only ones changed since the last review. So now this PR doesn't depend on a fixed android environment any more.