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

Change-Id: I9a229584235f5283fa27bcfa2a27c4b899202a1a