Merge "Replace obsolete bootstrap file"
authorC.J. Collier <[email protected]>
Fri, 27 May 2016 20:02:21 +0000 (20:02 +0000)
committerGerrit Code Review <[email protected]>
Fri, 27 May 2016 20:02:21 +0000 (20:02 +0000)

Trivial merge