Removing more code with API 21 dependencies.

Change-Id: I16c914334ce0694b84626269ae4bb5e83082c739
7 files changed