Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am: d655e61a22

Change-Id: I86d040528ab10e503e03f033f12d47a8142c3c6b