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

Change-Id: I512956e15a812f42714370e085b4c4b1efdf806c