Merge "Update paths to framework intermediates."