am 7a2d6229: am 4f0ae853: am afe64d7b: Merge "cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit '7a2d6229': cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH