Build against android-21.
am: 6c1c27f5ab

Change-Id: Ia89a40fb64dd2dfffcbde11bd65a1ff681efd148