Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1