Merge branch 'int/p/fp2' into rel/p/fp2/21.05.0-rel

* int/p/fp2:
  media: Adjust codec performance ranges
  media: Reactivate OMX.google.h264.decoder

Change-Id: Iac62a5b8a268d4b916c7aa003938c46d78ee8325