Merge "No longer need android/log.h"
am: b330559fb6

Change-Id: Ie2b65008349d874eb96f40da24b1333e7e62e7da