Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034c6" into pi-dev
am: 08ce69c929

Change-Id: I631141345bd39046c44f54fe12d55342790eb7cb