Merge "[automerger skipped] Cleanup bootclasspathFragmentInitContentsFromImage am: 360f8359 -s ours am: 3e99dac3 -s ours" into sc-v2-dev-plus-aosp