tree 8d21f5cbf029bf3b839386b82e6a4837559ea617
parent f38f456a20b77e2f03032d88dfa950ce6e72ae4a
author Avery Pennarun <apenwarr@gmail.com> 1457126703 -0500
committer Marty Faltesek <mfaltesek@google.com> 1458078247 -0400

Unrevert back to backports 20160122.

This reverts commit b531de79d31ac526073ed44838ce2b11dc5ea74d.

Next patch is needed in order to build on gfmn100.

Change-Id: Id45c637e03feb8448f9f6a5d25c9bb0405e75078