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

Change-Id: Id1e2c21dcf59006b1a15687c1d662facfc7b0fb8