Merge branch 'groovy-devel' of github.com:KazutoMurase/android_core into groovy-devel
Merge remote-tracking branch 'origin/groovy-devel' into groovy-devel