Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
am: d600905e4a

Change-Id: I6366391c3bb0c8df8d15427d32369f180c3f2060