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

Change-Id: Id40fc588ceb8defef8de2133e1ee4ecca09bb9d7