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

Change-Id: Iddd2d6d623ba7e6b605937def3bc9b0ac36b4d38