am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1

* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
  Fix for Don't allow adding 64-bit files(4086708)