Merge "Remove library tag"
am: 8739852bde

Change-Id: Iacb4c95812b620feafd25566db5562af684d8d99