Merge "Move android_*_stubs_current modules to frameworks/base" am: 1bc6c36e3e am: 553f2741b7

Change-Id: I2eb2e3ec668ecac89b6c4f18f26da08c38a02b51