Merge "libstagefright: Check trackMeta for NULL" am: 0cecba2751
am: 8d33f4e5a2

Change-Id: Ic572889a58007b7e61dd41b2fea8f41cd4c61d23