classpath: update for L

Change-Id: I1425a0a213c9954065ea8c95cf1f5b24480b70a5
Merge "classpath: update for L" into lollipop