Merge "Remove jdiff_enabled from platform metalava runs"