Merge from gingerbread - do not merge

Change-Id: Iba2f457ca4e8ea90078d1028e1ea829b3d889285
Merge 3c1b974a and a4f65ce7

Change-Id: I536026aab833367350b595b41911e9888cff2e3a
Removed invalid assert

Test for alpha==255 is apparently cloned from
S32A_Opaque_BlitRow32_arm, but does not apply to Blend variant.

Change-Id: I5d6154399265cb6f8291595a9bc62b2741301590
Merge "Removed invalid assert"
am 0896ce1e: (-s ours) Merge from gingerbread - do not merge

* commit '0896ce1e7b7418350e9f6ca9b4b9ad675ccb9b86':
  Restore legacy behaviors for better compatibility
Allow multiple styles for fallback fonts

Fallback fonts are now recorded with their styles in the list of
available fonts (which is now a doubly-linked list). NextLogicalFont()
has a new parameter, providing the originally requested fontID, from
which we can determine the requested style, which we then pass to
find_best_face() to pick from the available styles.

Bug: 4390209
Change-Id: I0c45fd7cefd00df3805bd75df77c519f6d922fe7
Revert "Allow multiple styles for fallback fonts"

This reverts commit da49dc51598fa6f5ffae857f73bb8be12caf216e.

Bug: 4980240
Change-Id: Ib0470d458db12821a89ce019d395152d06296305
Revert "Allow multiple styles for fallback fonts"

This reverts commit da49dc51598fa6f5ffae857f73bb8be12caf216e.

Bug: 4980240
Change-Id: Ib0470d458db12821a89ce019d395152d06296305
merge in ics-release history after reset to master
Allow multiple styles for fallback fonts

Fallback fonts are now recorded with their styles in the list of
available fonts (which is now a doubly-linked list). NextLogicalFont()
has a new parameter, providing the originally requested fontID, from
which we can determine the requested style, which we then pass to
find_best_face() to pick from the available styles.

SkFontHost::NextLogicalFont() no longer assumes that origFontID is
valid (see http://b/issue?id=4980240).

Bug: 4390209
Change-Id: I2e600f7eb75d207e95bae8cc9ed8379ade396058
Add Droid Ethiopic to fallback list

Regular and Bold styles are now included in the fallback list.

Bug: 4902641
Change-Id: Ia88dedb136ab00dee3ae4e4cc5552e0d3a743f13
Add support for WebP incremental decoding.

Updated the Android-Skia-WebP decoder with following changes:
- Added support for incremental WebP decoding. So instead of allocating
  input buffer corresponding to the whole image (could be few MBs), the
  input is read iteratively in a buffer size of 64KB.
- Refactored onDecode method (O(200) lines) to a smaller (O(30) lines)
  method with 2-3 helper functions.
- Removed low (byte-level) parsing from this code and calling WebP
  public APIs for the same (like WebPGetInfo).
- Incorporated Pascal's feedback.
- Few more feedback from Pascal.
Change-Id: I104822ec3922eca1efc19422908f07770c4c140b
merge in ics-release history after reset to master
Restored null-check in SkFontHost::NextLogicalFont

This updated line was to have been included in CL 118811, but some
bad gerrit-fu caused it to go amiss.

Bug: 4390209
Change-Id: Ia7b8e2849cfae3cdfbebc09a91fe26f2355f1ebb
Merge "Restored null-check in SkFontHost::NextLogicalFont"
merge in ics-release history after reset to master
Add null-check in remove_from_family()

An invalid face is not expected here, but still should not be allowed
to crash.

Bug: 5002710
Change-Id: Ifd11e918f968d5eef67932e514ea6754819fb7a5
Add null-check in remove_from_family()

An invalid face is not expected here, but still should not be allowed
to crash.

Bug: 5002710
Change-Id: Ifd11e918f968d5eef67932e514ea6754819fb7a5
merge in ics-release history after reset to master
Revert "Allow multiple styles for fallback fonts"

The change being reverted somehow alters the reference counting of
SkTypeface instances, resulting in prematurely freed font data, which
is the underlying issue with the disappearing clock on the lockscreen
(http://b/5004404).

This reverts commit 792a256ab723bbc4b55ba00194fe2a9195cae8c0.

Bug: 5004404
Change-Id: I5c3b225f860ce2dcfc0751bded2d842b43a2d3c4