Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread