Merge "Sanity check to make sure apk or jar files are not stripped" am: a62f435fea am: d79c788169
am: dddd865ef7

Change-Id: I62a4e24a86e4aca9563fdcb2abf5e1b847b704e5