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

Change-Id: I99af7a784c81f2f3b314270cd1600d13d0c3b904