Fixed follow https://code.google.com/p/android/issues/detail?id=58337. I hope it will build successful