Revert 176176

Revert 176176
> Update Android build to API level 17 and SDK Tools version 21
> 
> Some fixes included:
> - Changes to resource management to account for new R.java packaging
>   from library projects
>   (https://android-review.googlesource.com/#/c/43134/).
> - Fixed the package for some inludes in ModalDialogTest.java. This only
>   worked because of how we previously used to aggregate all resoures
>   from the prior layer. With the new packaging, we must use the resource
>   from the appropriate layer.
> 
> BUG=163001, 166434
> NOTRY=true
> 
> Review URL: https://chromiumcodereview.appspot.com/11819047

TBR=yfriedman@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176198