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

Change-Id: I1b069a98bffd2ac68207ac0d088056282e091b48