Merge "Create two variants of libstagefright_mpeg2support library"