switch back Browser to AOSP source
Merge branch 'bAOSP-5.0' into nAOSP-5.0