Changes to enable compile on Android JellyBean.

Changes to enable compile on Android JellyBean.

Now incorporates "create common V1&v2 code for Android, consolidating image
format handling."

Change-Id: I6312084f1425354b619361929da533aa5ac357e3
Reviewed-on: https://swiftshader-review.googlesource.com/2850
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>