Re-order incoming config params due to previous Android pr by zgiles, which inserted a new Android config param headers