Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
am: 6665fd5991

Change-Id: I53083a698a510ac07faa55eb35979514217b3292