Bringing in code changes for the ODroid.