Merge "make sure screenshot are in a format supported by Bitmap.java" into jb-mr2-dev