Merge "MediaFrameworkTest: Fix storage path" into qt-dev am: e83c7779c0 am: ce4db67c88
am: 367ff70954

Change-Id: Idadef882c714f9ee7e978f4d57ddc7f8de6bf46e