Merge "Make the library usable as a library." am: ca94f65ea0 am: b38e142021 am: 6e56344834
am: 9b736cbbee

Change-Id: Ie0cf285dc87c4e300d414b0a4101dce6e1cc4886