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

Change-Id: I9dff8e2e7d05c838b185e9219d7b0135d659e829