Merge "stagefright: add SDK constants in MediaCodecConstants.h" into pi-dev am: 3dd71b01f1
am: 6b309744de

Change-Id: I2208912c629a9245908619041b4f314c2ff19001