Merge "MediaFrameworkTest: Fix storage path" into qt-dev am: e83c7779c0
am: 105f6f68f8

Change-Id: I6cf41ceaa5eef83bce6b7b5bc4343157f768be40