Android CTS 5.1 Release 23 (4259358)
am 5d4c8689: Merge "Define a writeable CONFDIR for iproute2."

* commit '5d4c86892885ae1bc12e0e157b35ef44e8ba81bd':
  Define a writeable CONFDIR for iproute2.