Merge "Remove intialized static storage from dex cache."