Merge "Remove lock from ClassExt installation procedure."
am: 878d1889f7

Change-Id: I97016995197f6e6a24f174e5c62487eb57b9ee0e