Merge "Remove libimgpatch" am: ed96da6664
am: 36385bd9ee

Change-Id: I8ed0f92329550c4b643e8f52ad8471bce1e79769