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

Change-Id: Ie964845732468495bde286ed73f517362c81b8be