Replace android/log.h with android/log.h
Replace android/log.h with android/log.h

Partial reverse of course regarding export of macros into the ndk.
We still deprecate cutils/log.h, but we use log/log.h, not
android/log.h for the macros.

adjust history on commit 60dc8f0a53e309229c2e2309b3f6c70e57187e94.

Test: compile
Bug: 34250038
Change-Id: I523854afa0635396b0ee90051f9db6c0af3b5ea6

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt