Audrius changes for Android build