Merge "Add textview and framelayout inflation cases, refactor."
am: 1b3687c0e9

Change-Id: I67d3205ecc2518570ea8ebda5bb60dd86d722cf4