Merge "Create two variants of libstagefright_mpeg2support library" am: 4607206af8 am: 28275b41cf am: fd904533d2

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

Change-Id: Ia0abfda499ff5f5834140a28aea0b2449daa846e