Merge "ODROID-N2: Remove unused variable to build." into odroidn2-4.9.y-android