Merge "Fix the build"

Author: Romain Guy

api/current.txt

@@ -26377,6 +26377,7 @@ package android.widget {
     ctor public EdgeEffect(android.content.Context);
     method public boolean draw(android.graphics.Canvas);
     method public void finish();
+    method public android.graphics.Rect getBounds();
     method public boolean isFinished();
     method public void onAbsorb(int);
     method public void onPull(float);