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

Change-Id: I04de9df984e7371283372e681b1eaf87c31b64ed