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

Change-Id: Iad4539ec0eae2fb1e64fe9f733791251ea974a93