Merge "Fix up header path after aosp/2597360"