Merge "Fix NPE in BitmapFactory when an allocation of hw bitmap failed"