Update build-tools to ab/4836637
am: 4ed15bb7d1

Change-Id: I29660cdc07dd2d0029d0725f86924edd3f745752