Merge "Fix conditional log line in MediaPlayerService"

    // This is a benign busy-wait, with the next data request generated 10 ms or more later;

    // nevertheless for power reasons, we don't want to see too many of these.

    ALOGV_IF(actualSize == 0 && buffer->size > 0, "callbackwrapper: empty buffer returned");

    ALOGV_IF(actualSize == 0 && buffer.size() > 0, "callbackwrapper: empty buffer returned");

    unlock();

    return actualSize;

}