Take changes related to lanirAndroid being moved to separate repo.