Make sure we mark Plots in use for all regenerate cases

Change-Id: I49b2cd7f634faa4a233038f3c1eaa507c630d95d
Test: Added fontregen GM to verify fix.
Bug: b/118850208
Merged-In: I986cd20ff387aa34e2750c10b53aa8a73ba85ed3
6 files changed