unused include
Merge branch 'master' into ice-cream-sandwich
EncryptionInfo moved to ZLFile level
Merge branch 'master' into ice-cream-sandwich