removed bitstream stuff from android config
minor fix
updating waf to support bundle_use_master option