Merge "Be consistent with android log tags between target/host."