Update build-tools to ab/5285575 am: f6b81f5d86
am: 5d34681ebd

Change-Id: Idc2155f0ed3453213b61fd15b2a12f4ca7db036c