This reverts commit 7d2e0f7f Reason for revert: Android SDK sources for VanillaIceCream are not available, making it hard to debug.
7d2e0f7f