Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779 am: 146ef50d5b
am: dc4c11ff9f

* commit 'dc4c11ff9f9c108e80163ee7ed45bb42db855942':