Merge "C2OMXNode: read delay from component to determine buffer count" am: 68ca207ba6 am: 233058f34e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1497750

Change-Id: I53feef68fe66123e31b1d8bfccf3454e0ba321d1