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

Change-Id: I5d58201c4c15ef02d78677b03fe9701ed7dd8ab5