Merge "Move android_*_stubs_current modules to frameworks/base"