Merge the 2020-05-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  libexif: Fix read buffer overflow

Change-Id: Idf32430c99fd24348f0477d3055ae56249e1d5a4