Merge "Remove obsolete restriction with allocations and dex cache."
am: bc4576c791

Change-Id: If456735e088e3dbd3ca3745cede74a2c20dcfe8d