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

Change-Id: I786ef5c74602466c99b2b4eb84c41146dae6e33f