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

Change-Id: I9e1443cfe8726e51a51ac9eec104db85c69c991e