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

Change-Id: I78c237b954f053cd22faaf85aa8d84315172bec5