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

Change-Id: I2c33cb752fd70c248fb1083be69063cdb2f7d9b3