Merge branch 'jb-mr2.0.0-release' of https://android.googlesource.com/platform/frameworks/base into cm-10.2

Change-Id: I502969f8a7a4b0ee71b113fbca1de1766e168c79