Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread