Merge "Make extract_package() work for toplevel classes."
am: c9c54798f6

Change-Id: Ib97e34604f4284e770d375eb4666303e0234c245