Merge "libhardware: deprecate cutils/log.h" am: 2aca8ea500
am: 96e218f8ee

Change-Id: Ia8dd2f44e0f41c739e47886d966c34db39e41314