am 4f0ae853: am afe64d7b: Merge "cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '4f0ae8533816d3df820f89653782ef71910e8cb0':
  cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH