Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c
am: 471053ba87

Change-Id: I5a0558926bdfae52bb867e3b6d3321fbc4e3b61b