Fix support lib build DO NOT MERGE ANYWHERE

Change-Id: Id18358eea443b1875fa2b2613c443c95144c7921
1 file changed