Merge "Make Environment.getProductDirectory() @TestApi"