Merge "Refactor translateSystemPathToApexPath" am: ba198d5084

Change-Id: I530abbb026b5f96dc3c4d83833f0a8b7c4fda18a