Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23 am: 6f84b4a716 am: bbe900ad12
am: 5af7309214

Change-Id: I0c2a7a0727acf4a97506ee801c4f081145a88ff1