am 113eaa59: Merge change 8131 into donut

Merge commit '113eaa59c1dfafd548a13919e48c0346c0c925ac'

* commit '113eaa59c1dfafd548a13919e48c0346c0c925ac':
  Fix android.core.FileTest#testFile: add sdcard write permission to test.