Merge "Add Android-removed tags for removed ClassLoader AssertionStatus code."