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

Change-Id: Iba340fa6638df6185888ae6c98807aa5413b0c96