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

Change-Id: I9aa578fc31e9a6cbed36c9f291e7f0e165de5d0d