Revert android build tools update

https://code.google.com/p/android/issues/detail?id=61710
Signed-off-by: Shea Levy <shea@shealevy.com>