am 3137f8c5: am 6567adf8: Move android-common to framework/ex

Merge commit '3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp

* commit '3137f8c54d00d8eefe011a0256e2d85a036b207c':
  Move android-common to framework/ex