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

Change-Id: I909132184308e414f1ef3c011682aa46b98398ff