Merge "Add missing stack errors to android code" into tizen