Merge "Fix AMediaDrm_setPropertyByteArray"