Pulling in dependency changes from //developers/build commit 5d58bc4802 Change-Id: Ie7a807995dc5ffbaa2c0da2cc51795553495196b
Change-Id: Idd8cc6b7c43ab93f05f0a5d69d5379631721d185