Fix Windows build scripts for no bearer management option

Change-Id: I487db96f7b3d33f9493f9bff44634f3365ca17f4
Fix typo in Android build script

Change-Id: I6463ebc54ba90ae7125c8909469a94089b759de7
Merge branch 'st' into android-hidpi