Suppress warnings on diff_match_patch and relax null analysis

Change-Id: I84fc7ff9ebc6f823f295f6ca5aee60f8ed8e0f0c