Merge "goldfish: rename goldfish_logcat.te to logd.te"