Merge changes from topic "magnifier_expose_size_and_zoom"

* changes:
  [Magnifier-33] Add animation on line jump
  [Magnifier-32] Do not magnify outside selection
  [Magnifier-31] Do not magnify outside current line
  [Magnifier-29] Expose size and zoom in the API

diff --cc api/current.txt
Simple merge

diff --cc core/java/android/widget/Editor.java
Simple merge

diff --cc core/java/android/widget/Magnifier.java
Simple merge