Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 0915931939 am: 544c774381
am: 92ccb271ce

Change-Id: If5c4f35573d0c73bf412b22406d04e70fba1f17c