Merge "Fix Environment.isExternalStorageLegacy() impl." into qt-dev
am: c703d04fbb

Change-Id: Id3d37b5e1fb02009a647c851194bd14614f86b44