Fix path for AOSP custom merge