tree 65422e391ab60e092599ec28c3f60296e0b662c0
parent c3d4553d462521bc77b719109ea8cf5b5812d471
author Adam Cohen <adamcohen@google.com> 1434740975 -0700
committer Adam Cohen <adamcohen@google.com> 1434741170 -0700

Add extras required for compilation

-> Patching back from a future branch

Change-Id: I5127a82560e39bf391fe083d0eb8932cf2473562