Merge "Fixed AMediaDrm_getKeyRequest returning both new and old requests."