Merge \\"Fix use of API 19+ FrameLayout LP constructor DO NOT MERGE ANYWHERE\\" into nyc-dev am: dd5487bc83  -s ours
am: 82a0ac637f  -s ours

Change-Id: I97d055d624e3d1197f84785679cb53fb1ed87c21