Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2eea4 am: 9e97dc7832
am: 1121dfb5f3

Change-Id: Ie8bea1c228c602fef54012228ed714e8053d8fa6