Initial update to build files to fix Android build.