JOP40G

Conflicts:

	core/build_id.mk

Change-Id: I58d5c1b03d2bc43aaacbbbf8aeeaf9aa7c9a74b3
Drop official SDK 17

The SDK was downloaded with the Eclipse Android SDK Manager.

Change-Id: Ieb26ff03da08fae8a690fc1eb46549bcbe937233