Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev