Revert "Fix build. Update support library @ 2533503 from master BUG=26543888 BUG=26558558"

This reverts commit b2f1177b7c1c913c1feaa936fd2d75b6c54dec81.

Change-Id: I3d269246f1fd73e79dbe2f56407156a8ff72696a
19 files changed