Update build-tools to ab/6416774 am: 659efe1cd8 am: c6c781c297

Change-Id: I9a750fa353dafc1486ae9ecc149e772053999e36