Fix support lib build DO NOT MERGE ANYWHERE
am: 287c5a0be2  -s ours

Change-Id: I9d7bf5adbf998a536fc2c2992ef4da52ccd15943