Fix for 20.0.0 build tools bug

reference: https://code.google.com/p/android/issues/detail?id=77629
Merge pull request #65 from VipSaran/master

Fix for 20.0.0 build tools bug