Merge "Add dnsproxyd to keep in sync with base init.rc"