Fix support lib compilation. DO NOT MERGE.

Change-Id: I8fff3881cb4aee20c568f4678e6ee007d179054d
2 files changed