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

Change-Id: I33dcf75d6120211faefeed9a4c9b1b0164be30a7