Merge "Move log tag definition from Android.bp to cpp file."