Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149a9 am: 8347d50e63 am: ef977699de
am: b9c3d1990c  -s ours

Change-Id: I1359b06a0a597340a3923d7655911ca0f6dd59d6