Merge "Deprecate <cutils/log.h> and <utils/Log.h>" am: 67519a5f72
am: 955add2bb2

Change-Id: I063db609bd38cb93ce4dc05ee05316d47f9facba