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

Change-Id: Iefee73f4426d75ff60be9036f3d714947017889f