bluejay: Sync extract scripts with templates

Change-Id: I83561b9064f7f27af90e21ac72a9c76e1dad8fad
7 files changed