Revert "Auto merge of #16566 - aneeshusa:remove-android-sdk-override,… …
… r=larsbergstrom" This reverts commit 779edd7, reversing changes made to 31c7198.
