utils: Update AOSP forking script

Change-Id: Ifbb68a5940c079b8b0898e6a7d66df92d9077c28
Merge "utils: Update AOSP forking script" into android-4.4