Merge "Make extract_package() work for toplevel classes." am: c9c54798 am: 33004985 am: 595272c9 Change-Id: I5878d03ddfdf0fc21bfb1a2a6cd457154c2c69d7