Unrevert back to backports 20160122.

This reverts commit b531de79d31ac526073ed44838ce2b11dc5ea74d.

Next patch is needed in order to build on gfmn100.

Change-Id: Id45c637e03feb8448f9f6a5d25c9bb0405e75078
2917 files changed