5e7e8da04d
Merge commit 'b799616d8f0f94e866767fa730f56d82543fb49b' * commit 'b799616d8f0f94e866767fa730f56d82543fb49b': Move ExifInterface to android.media package so we can reference it from MediaScanner.