Merge "Pass Context to Build.*Configuration" am: 0d45fe440d am: 4321cded8c

Change-Id: I9e5b0212ff8bed7f53792bb0a2403b7a41b80509