Merge "Fix use of API 19+ FrameLayout LP constructor"