Merge "Stop building unused library." am: 71b85f6e70 am: e1f3b8c9a2 am: a01b05d986 am: 0509b5ffb9
am: d8b04ededc

Change-Id: I3b23d6ed4869f14f620c31a699e288d1a823f44b