Merge "Remove unused libraries" am: 50d665574a am: b271256e43
am: 1fad7c74f5  -s ours

Change-Id: I3176481175209f86efc6e05e7d37c083fa313d84