Android 2.1 release 2.1p2
Merge "Fix sorting of Sample-type packages" into eclair