[automerger skipped] Separate mainline-used ESDS from rest of libstagefright...

[automerger skipped] Separate mainline-used ESDS from rest of libstagefright am: b5ccf1b5 am: 5f4f832e am: b9a82aab am: 79dc645f am: 8349a7e4 -s ours

am skip reason: Merged-In Ie50784b51a5e1cf7990d376f9a509f2cd3a82df9 with SHA-1 5814d4eb is already in history

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



Change-Id: Icf2e7be5c5c8abae5ba786151774452da3922d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>