androidprojectpatcher: Also detect broken cherry-pick with diff
androidprojectpatcher: Also detect broken cherry-pick with diff

Change-Id: I2b6c311065b84b3e58b323a3c6a2977f3728313b
Signed-off-by: Adrian DC <01fb3892f39957945220431e7409156544d2f041@gmail.com>

AdrianDC/android_development_shell_tools,AdrianDC/android_development_shell_tools