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

Change-Id: I41582b7765e519877c02339aa7a299bbd2cfca71