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

Change-Id: Ib21e5352a702945418be84033dae09f385817a6a