Merge "Change library name"
am: 02c50c453d

Change-Id: I18834561c7ee4d6ad1dd5485781a93183ad2f3b2