Merge "Move "include configure_local_jack.mk""