Merge "Fix typo of --oat-fd description in help"