Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29