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

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

Change-Id: I565979564bca79177ae7628dffc923c9cb8903c0