Merge "Fall back to normal split if imgdiff fails when splitting large apks" am: 520c9f0f5f am: ff9efd3290
am: a40db9c53b

Change-Id: I151967860c3d4ddd4c6bcb902f57f3786f8d78bf