Merge pull request #712 from kwhatmough/next

Update build script for Android.
Update remaining scripts for flattened shaders folder.