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

Change-Id: Id16b3a549befbf56522d53eacb8d8aeb16135b33