Minimum changes to operate with engine on Android #138