Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master