Merge changes I1f9b7b13,I36bc4a44

* changes:
  Deprecate <cutils/log.h> and <utils/Log.h>
  Replace SLOG() with LOG(ERROR)