Fix support lib build DO NOT MERGE ANYWHERE am: 287c5a0be2  -s ours am: 81b9c48ed6  -s ours am: 4266645650  -s ours
am: 83bf38805c  -s ours

Change-Id: I04f3faa58f395d6918017b7f98136407981f4af1