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

Change-Id: If692a290bb55aa03c39dfcb669605f3c4889ea39