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
am: 3edf162cb4  -s ours

Change-Id: I93a84b338f35e268071eed3de9103e8dc897a270