Merge "Move static vars into functions in bl1" into integration