flatten resources directory

Flatten resources directory

On android trybots, the files in a subdirectory weren't being
loaded onto the device.  Consequently, the ImageDecoderOptions
test was not testing anything. I had to relax that unit test
to reflect the existing behavior of our libjpeg decoder on
Android.

R=djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=14682

[djsollen, 2014-05-09 16:01:44]

lgtm

[hal.canary, 2014-05-09 16:16:39]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2014-05-09 16:17:51]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/halcanary@google.com/264583007/20001

[commit-bot: I haz the power, 2014-05-09 16:24:15]

Change committed as 14678

[hal.canary, 2014-05-09 18:08:39]

Committed patchset #1 manually as r14682 (presubmit successful).