Support different branches for package building

Change-Id: Ia7d7a3fe08c4159ffe84d98cf8fe7ecf8628e551