Fixed tests relying on non-released SDK build tools version 21

Change-Id: Ie56ecd8cf3e1b8746a0b9f208735fafc7ebd5907
503 files changed