Merge "media: Replace cutils/log.h with android/log.h or log/log.h"